Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

8284: Fix Jolokia discovery issues #597

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

8284: Fix Jolokia discovery issues #597

wants to merge 4 commits into from
+10 −112

Conversation

skarsaune
Copy link
Contributor

@skarsaune skarsaune commented Oct 30, 2024 •
edited by openjdk bot
Loading

This fixes two bugs with Jolokia discovery:

  1. serious : repeated discovery runs crash. Runing repeatedly in the background is the whole point
  2. more of an annoyance: the PR disables JMC agent by omitting JVM info in the descriptor (as presence is interpreted as a local JVM)
    Both tested OK.

Progress

  • Commit message must refer to an issue
  • Change must be properly reviewed (1 review required, with at least 1 Committer)

Issue

  • JMC-8284: Fix Jolokia discovery issues (Bug - P2)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jmc.git pull/597/head:pull/597
$ git checkout pull/597

Update a local copy of the PR:
$ git checkout pull/597
$ git pull https://git.openjdk.org/jmc.git pull/597/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 597

View PR using the GUI difftool:
$ git pr show -t 597

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jmc/pull/597.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 30, 2024

👋 Welcome back skarsaune! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Oct 30, 2024 •
edited
Loading

@skarsaune This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8284: Fix Jolokia discovery issues

Reviewed-by: aptmac

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 8 new commits pushed to the master branch:

  • b75d151: 8290: Handle resources warnings
  • 3b96b0f: 8274: Add thread counts to the Java Application page
  • bf3aa4c: 8286: Fix broken launcher
  • 13cef0c: 8278: Update COPYRIGHT, LICENSE.txt and THIRDPARTYREADME.txt files
  • fadc260: 6683: Mouse over for Event Thread should show the various thread IDs
  • 45b2a4b: 8288: Clean up warnings
  • 92fe681: 8287: Fix the JMX protocol extenders
  • 9370abe: 8219: Missing coverage in application reports

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@aptmac) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@skarsaune
Copy link
Contributor Author

@aptmac : Are you able to create a bug for this. Or two if that is preferrable.
Details on the bugs:

SEVERE: Cannot register MBean jolokia:type=Discovery,agent=jmc: javax.management.InstanceAlreadyExistsException: jolokia:type=Discovery,agent=jmc
javax.management.InstanceAlreadyExistsException: jolokia:type=Discovery,agent=jmc
	at java.management/com.sun.jmx.mbeanserver.Repository.addMBean(Repository.java:322)
	at java.management/com.sun.jmx.interceptor.DefaultMBeanServerInterceptor.registerWithRepository(DefaultMBeanServerInterceptor.java:1848)
	at java.management/com.sun.jmx.interceptor.DefaultMBeanServerInterceptor.registerDynamicMBean(DefaultMBeanServerInterceptor.java:945)
	at java.management/com.sun.jmx.interceptor.DefaultMBeanServerInterceptor.registerObject(DefaultMBeanServerInterceptor.java:880)
	at java.management/com.sun.jmx.interceptor.DefaultMBeanServerInterceptor.registerMBean(DefaultMBeanServerInterceptor.java:315)
	at java.management/com.sun.jmx.mbeanserver.JmxMBeanServer.registerMBean(JmxMBeanServer.java:523)
	at org.jolokia.server.core.service.impl.MBeanRegistry.registerMBeanAtServer(MBeanRegistry.java:80)
	at org.jolokia.server.core.service.impl.MBeanRegistry.registerMBean(MBeanRegistry.java:54)
	at org.jolokia.server.core.service.impl.JolokiaServiceManagerImpl.registerMBean(JolokiaServiceManagerImpl.java:409)
	at org.jolokia.server.core.service.impl.JolokiaContextImpl.registerMBean(JolokiaContextImpl.java:45)
	at org.jolokia.server.core.service.api.AbstractJolokiaService.registerJolokiaMBean(AbstractJolokiaService.java:98)
	at org.jolokia.service.discovery.JolokiaDiscovery.init(JolokiaDiscovery.java:45)
	at org.openjdk.jmc.jolokia.JolokiaDiscoveryListener.discoverJvms(JolokiaDiscoveryListener.java:70)
	at org.openjdk.jmc.jolokia.AbstractCachedDescriptorProvider$Scanner.scan(AbstractCachedDescriptorProvider.java:86)
	at org.openjdk.jmc.jolokia.AbstractCachedDescriptorProvider$Scanner.run(AbstractCachedDescriptorProvider.java:70)
	at java.base/java.lang.Thread.run(Thread.java:1583)
  1. This option does not make sense for Jolokia:
image

@aptmac
Copy link
Member

aptmac commented Oct 31, 2024

@skarsaune I've rolled both of these issues into one ticket if that's okay, I think it fits with this PR that accomplishes both at once.

https://bugs.openjdk.org/browse/JMC-8284

@skarsaune skarsaune changed the title Jolokia discovery issues JMC-8284: Fix Jolokia discovery issues Oct 31, 2024
@openjdk openjdk bot changed the title JMC-8284: Fix Jolokia discovery issues 8284: Fix Jolokia discovery issues Oct 31, 2024
@openjdk openjdk bot added the rfr label Oct 31, 2024
skarsaune
skarsaune commented Oct 31, 2024
View reviewed changes
.../org.openjdk.jmc.jolokia/src/main/java/org/openjdk/jmc/jolokia/JolokiaDiscoveryListener.java

public JolokiaDiscoveryListener(JolokiaDiscoverySettings settings) {
this.settings = settings;
jolokiaDiscovery = new JolokiaDiscovery();
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ensure that only one instance is instantiated (linked to the lifecycle of this plugin). If one tries to instantiate another, it will attempt to register an MBean and sinply crash

@mlbridge
Copy link

mlbridge bot commented Oct 31, 2024 •
edited
Loading

Webrevs

@aptmac
Copy link
Member

aptmac commented Nov 1, 2024

There's a fix to the spotbugs config that will fix the Mac tests just an fyi

@skarsaune
Copy link
Contributor Author

There's a fix to the spotbugs config that will fix the Mac tests just an fyi

Indeed, the test passed after merging in master 😄

@openjdk openjdk bot added the ready label Nov 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aptmac aptmac aptmac approved these changes

Assignees
No one assigned
Labels
hacktoberfest-accepted ready rfr
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@skarsaune @aptmac @thegreystone